x86 hvm: Guests should scan CPUID range 40000000-4000ff00 for Xen leaves.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>

diff --git a/tools/firmware/hvmloader/hvmloader.c b/tools/firmware/hvmloader/hvmloader.c
index 581bcafc522d3e48ae0331deec5ae551599c1261..ee12f3603c2c3bc728b482594bb02d74b616fed9 100644 (file)
--- a/tools/firmware/hvmloader/hvmloader.c
+++ b/tools/firmware/hvmloader/hvmloader.c
@@ -123,7 +123,7 @@ static void init_hypercalls(void)
     xen_extraversion_t extraversion;
     uint32_t base;
 
-    for ( base = 0x40000000; base < 0x40001000; base += 0x100 )
+    for ( base = 0x40000000; base < 0x40010000; base += 0x100 )
     {
         cpuid(base, &eax, &ebx, &ecx, &edx);
 

diff --git a/tools/misc/xen-detect.c b/tools/misc/xen-detect.c
index c50cf185accd86e758ece6dcfbf0d10166d0fb25..7bb767989a0f45a5c402560feeab64e8bc3983a9 100644 (file)
--- a/tools/misc/xen-detect.c
+++ b/tools/misc/xen-detect.c
@@ -52,7 +52,7 @@ static int check_for_xen(void)
     char signature[13];
     uint32_t base;
 
-    for ( base = 0x40000000; base < 0x40001000; base += 0x100 )
+    for ( base = 0x40000000; base < 0x40010000; base += 0x100 )
     {
         cpuid(base, &eax, &ebx, &ecx, &edx);
 

diff --git a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
index f081cb1115b986eafecfb4cd9764980174f0ca8a..87dac049c05cb0fd05c51543dc4a04849275da0b 100644 (file)
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-pci.c
@@ -116,7 +116,7 @@ static uint32_t xen_cpuid_base(void)
        uint32_t base, eax, ebx, ecx, edx;
        char signature[13];
 
-       for (base = 0x40000000; base < 0x40001000; base += 0x100) {
+       for (base = 0x40000000; base < 0x40010000; base += 0x100) {
                cpuid(base, &eax, &ebx, &ecx, &edx);
                *(uint32_t*)(signature + 0) = ebx;
                *(uint32_t*)(signature + 4) = ecx;